From 788b4a623e9127dd833643ece81b0d6fd8a4456c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 2 Dec 2010 09:37:04 +0000 Subject: [PATCH] x86: Add -Wredundant-decls to Xen build flags. Fix up the fallout. Signed-off-by: Keir Fraser --- xen/arch/x86/Rules.mk | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 2 -- xen/arch/x86/tboot.c | 2 +- xen/arch/x86/time.c | 1 - xen/arch/x86/traps.c | 30 ------------------------------ xen/common/memory.c | 1 + xen/common/page_alloc.c | 1 + xen/include/asm-x86/processor.h | 25 ++++++++++++++++++++++++- xen/include/xen/tmem.h | 1 - 9 files changed, 28 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index d8663a6184..ec3abdd2be 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -16,7 +16,7 @@ ifneq ($(XEN_OS),SunOS) CFLAGS += -nostdinc endif -CFLAGS += -fno-builtin -fno-common +CFLAGS += -fno-builtin -fno-common -Wredundant-decls CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index ec34170ce1..57e7a16d63 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -170,8 +170,6 @@ int vmce_domain_inject(struct mcinfo_bank *bank, struct domain *d, struct mcinfo extern int vmce_init(struct cpuinfo_x86 *c); -extern unsigned int nr_mce_banks; - static inline int mce_vendor_bank_msr(uint32_t msr) { if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 7a9421e7c6..ae2d620099 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -46,7 +46,7 @@ static uint64_t __initdata sinit_base, __initdata sinit_size; #define TXTCR_HEAP_BASE 0x0300 #define TXTCR_HEAP_SIZE 0x0308 -extern char __init_begin[], __per_cpu_start[], __bss_start[]; +extern char __init_begin[], __bss_start[]; #define SHA1_SIZE 20 typedef uint8_t sha1_hash_t[SHA1_SIZE]; diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index ad37cb3075..56e16e65c1 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1837,7 +1837,6 @@ static void dump_softtsc(unsigned char key) { struct domain *d; int domcnt = 0; - extern unsigned int max_cstate; tsc_check_reliability(); if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 63ab58ccd4..2eedfc3769 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -97,30 +97,6 @@ idt_entry_t idt_table[IDT_ENTRIES]; /* Pointer to the IDT of every CPU. */ idt_entry_t *idt_tables[NR_CPUS] __read_mostly; -#define DECLARE_TRAP_HANDLER(_name) \ -asmlinkage void _name(void); \ -asmlinkage void do_ ## _name(struct cpu_user_regs *regs) - -DECLARE_TRAP_HANDLER(divide_error); -DECLARE_TRAP_HANDLER(debug); -DECLARE_TRAP_HANDLER(nmi); -DECLARE_TRAP_HANDLER(int3); -DECLARE_TRAP_HANDLER(overflow); -DECLARE_TRAP_HANDLER(bounds); -DECLARE_TRAP_HANDLER(invalid_op); -DECLARE_TRAP_HANDLER(device_not_available); -DECLARE_TRAP_HANDLER(coprocessor_segment_overrun); -DECLARE_TRAP_HANDLER(invalid_TSS); -DECLARE_TRAP_HANDLER(segment_not_present); -DECLARE_TRAP_HANDLER(stack_segment); -DECLARE_TRAP_HANDLER(general_protection); -DECLARE_TRAP_HANDLER(page_fault); -DECLARE_TRAP_HANDLER(coprocessor_error); -DECLARE_TRAP_HANDLER(simd_coprocessor_error); -DECLARE_TRAP_HANDLER(machine_check); -DECLARE_TRAP_HANDLER(alignment_check); -DECLARE_TRAP_HANDLER(spurious_interrupt_bug); - void (*ioemul_handle_quirk)( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); @@ -1570,9 +1546,6 @@ static uint32_t guest_io_read( unsigned int port, unsigned int bytes, struct vcpu *v, struct cpu_user_regs *regs) { - extern uint32_t pci_conf_read( - uint32_t cf8, uint8_t offset, uint8_t bytes); - uint32_t data = 0; unsigned int shift = 0; @@ -1626,9 +1599,6 @@ static void guest_io_write( unsigned int port, unsigned int bytes, uint32_t data, struct vcpu *v, struct cpu_user_regs *regs) { - extern void pci_conf_write( - uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data); - if ( admin_io_okay(port, bytes, v, regs) ) { switch ( bytes ) { diff --git a/xen/common/memory.c b/xen/common/memory.c index 37b3136b2a..33cc3f3e32 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_X86 diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 257f6bcf91..08616405cf 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 7c24013cc2..bdc761d96a 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -556,7 +556,30 @@ extern void mtrr_ap_init(void); extern void mtrr_bp_init(void); void mcheck_init(struct cpuinfo_x86 *c); -asmlinkage void do_machine_check(struct cpu_user_regs *regs); + +#define DECLARE_TRAP_HANDLER(_name) \ +asmlinkage void _name(void); \ +asmlinkage void do_ ## _name(struct cpu_user_regs *regs) +DECLARE_TRAP_HANDLER(divide_error); +DECLARE_TRAP_HANDLER(debug); +DECLARE_TRAP_HANDLER(nmi); +DECLARE_TRAP_HANDLER(int3); +DECLARE_TRAP_HANDLER(overflow); +DECLARE_TRAP_HANDLER(bounds); +DECLARE_TRAP_HANDLER(invalid_op); +DECLARE_TRAP_HANDLER(device_not_available); +DECLARE_TRAP_HANDLER(coprocessor_segment_overrun); +DECLARE_TRAP_HANDLER(invalid_TSS); +DECLARE_TRAP_HANDLER(segment_not_present); +DECLARE_TRAP_HANDLER(stack_segment); +DECLARE_TRAP_HANDLER(general_protection); +DECLARE_TRAP_HANDLER(page_fault); +DECLARE_TRAP_HANDLER(coprocessor_error); +DECLARE_TRAP_HANDLER(simd_coprocessor_error); +DECLARE_TRAP_HANDLER(machine_check); +DECLARE_TRAP_HANDLER(alignment_check); +DECLARE_TRAP_HANDLER(spurious_interrupt_bug); +#undef DECLARE_TRAP_HANDLER int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); diff --git a/xen/include/xen/tmem.h b/xen/include/xen/tmem.h index cc19110505..5dbf9d5681 100644 --- a/xen/include/xen/tmem.h +++ b/xen/include/xen/tmem.h @@ -12,6 +12,5 @@ extern void tmem_destroy(void *); extern void *tmem_relinquish_pages(unsigned int, unsigned int); extern unsigned long tmem_freeable_pages(void); -extern int opt_tmem; #endif /* __XEN_TMEM_H__ */ -- 2.30.2